Fixed map extraction test
More work on extraction