Fix tests and test cleanup
Now to rerun the build and then clean up the commits