some cleanup, specs and test setup