Move tests to the appropriate section