Adding commentary and making some tests more consistent.