Updated tests to be less redundant with the base Model class.