Use Compat module for Dict compatibility
Fix tests