Some tests clean up and fixes