Unit testing and Models wording fixes