fixed all of the tests ???