Create model tests and revise models accordingly