A little refactoring as well as added a new test. Also now have another failing test