Added more tests, airport, and methods using shovel, etc