tests fixes 3