Updating tests, comments for MITx -> edX transition

Also whitespace changes