Move tests that were left in old test/layout location