Some basic fixes to tests
Test fixes