Proper end-to-end tests
Created by: yytosi