Fixed broken unittests
Added error messages to tests