WINDUP-140

Separate map test classes