Added more models, a test