Fixed up tests
Updated dependencies