refactored convenience-hack test