Fixing a inconsistency in getEntity in Airship and more tests.