clean up tests and dependencies a bit