Most of AirportTest completed

Need to update Airport once I've commited.
Update still needs testing