fixed test before merge