Remove master column from zones table
Fix tests