Added additional Thing types. Tests now extend from a base class.