Fixed custom tests according to specs