Refactor TestMap Project