Update functional test
Updated map tests