Some basic tests fixes