Fixes object extensions and tests