More refactoring and time for multiple tests =D