fixed some tests. There is probably more tests in need of prunning