code cleanup
Change to use Pojomatic's ClassProperties for testing.
Made use of PojomaticObject optional.