Jeff/Bryan map test working