some more tests, cleanups, update dependencies