fixes test cases due to refactor