a few more test fixes. Almost done with cleanup so i can go back to important stuff