move tests back into place