Updated dependencies and hacked up some tests