Added object map tests