new maps and tests
merge