Updated failing unit test, added some test coverage