After refactoring, a lot of these test cases became unnecessary