Tests rearranged