ITERATE: fixed some typos + re-factored tests + addresses @gramfort's cmts on issue #219
mergeconflict