Improved DispositionOptions parser and added test cases