Core 'compat' module updated
Tests updated