made tests pass again, one had to be pending

The tests were broken, some merge failures from earlier not sure, but some stuff Neal and I have made a couple times was deleted. I re-added so all tests passed except the pending one due to the map creation page being in flux