Cleaning more tests