Fixed one unit test and broke a few other