Ok, removed use_m2crypto arguments for now, since the test using it wasn't in there anyway. Updated TODO.