Reversed Map and Village tab + disabled background for them
Renamed tests for unification