Re-added MasterNodeAddress to unittests