fixes failing test-cases