Added more to the unit tests