Add units to large test map
remove unused imports