Added testMap, removed old models