Making map bigger and removing old test code