fixing backward compatibility with old emerald
fixed new and old test failures