Clean tests a bit