Changed how TestUtility handles map generation.