Fixed some more tests - remove tests still fail