Fixed more tests, only preening test fails