Forgot to run a clean install, a few changes to make the tests pass.