Clean tests up