Fixed a failing unit test and added another