Added two model tests and two feature tests