Adding bigger map and more testing