Rearranged tests in accordance with shop test fixture changes