tests fixed; DispositionType parsing fixed