ALM-682 more test tweaking