Only using typedefs in tests

This makes tests and usage of parser less dependant on internal
types.
Options can have values