Added tests and code for setup map