Added a couple more unit tests which failed and then fixed them