more tests, more tasks
clean up