Finished flight service with tests