More test cleanups
Fixed first 3 tests
Fixed first 4 tests
blush and forget this broken