Fixed the test cases to work with refactors