Move tests back into tests dir