Clean and speed up tests