tests fixed; DispositionType parsing fixed
FutureMatchers fxied