Fixed tests to work with the new map