[#1488] Move tests where they will actually get run