BS-7150 Fixx import bos and test import organization