Move Aviator tests to same dir as code