Added more parsing options and tests; Added formatting stubs