Factories test rearranged