correct failing tests
simplify