Clean tests, remove timing