Added error messages to unit tests (2)
Added more unit tests