simplify tests by removing abstractions