tests fixes - part 1