Re #8635. Fixing mixed up tests.
Merge branch 'feature/8635_kernel_strings' into develop