Added some comments;  removed additional case; whitespace cleanup on
tests