restructured ModelTest to be in module, adapted example