Added object dictionary
Updated tests