more code coverage, add new scenario and types.