cleaning tests a bit and breaking others