Changed a bunch of unittests