Changed ArrayMap to ArrayDictionary and added more tests
Modified Map to use ArrayDictionary