clean up some tests
bump deps
tweak tools
WIP refactor