Test extensions and fixes