Fixed these tests so they don't interfere with later tests
Fixed more tests