Fixing the tests. Not done yet