fixing a bunch of test