refactoring of airtime bits into smaller pieces and adding two extra tests (thanks @imsickofmaps)