enhance unit tests to verify type of return value of extra_options() static method
refactor to make all extra_options return a list of tuples rather than a dict, conform the framework v1.x API