Add -o and -p flags as shorthands for --optimistic and --pessimistic flags, respectively. Add tests to cover these new flags