Update dependencies
Cleanup tests
Code tweaks