Expanded test coverage, tests now fail