Models should exist and be singular

This partially reverts af8f9a7bffa238db2648dfc28f23b7618f6881f2
Change class_name to assert on the real class name