Refeactoring, removing silly tests