Move tests back to testing folder