Turned property types into inheritable objects.  More tests