6501 tests @wip