Added test map and modified some names