move tests out of way