Move aviator tests into same locaiton as code