Fixed test cases that broke from refactoring