Fixed unit tests & error messages