Return the correct type of model and change tests to reflect a more reasonable set of conditions