Yep, definitely needs a test since the map stuff could break easily.  I'll add one.