clean up comments, make test work with minimum_master_nodes