[130] Revert 'Misc fixes (TEST)...'.