Bring back domain objects and start using them in a new TypesTest which uses the examples from demos but changed into a test format