New Test Map, fixed bugs.