BF: fix modularity test passing index as improper type (list), and removed some cruft
RF: clean up 1/0 a bit, preparing for _check_integrity