More refactored tests