got the tests running and fixed the last bugs from the dependency upgrade