tests and models beautified