Moved test classes into a new source folder.
Added new model primitives.