AS7-6531 Fix backward compatibility issues found by reverse controller tests

and fix some test issues.