Move async tests back to original files