Added more map tests
Added more map tests
Added more map tests
Added more bugs