Cleanup and additions to domaptest.clj