shorter, less mocking tests