tests fixes 2