Obfuscated handling and unit test updates