tidy ups
tests and dsl