More comments and other minor fixes.
Renamed test removed from Git.