CDB-1858 fixed specs now failing due to merge with named maps