Standards compliance changes

A few simple changes:

1.  Added docblock comments
2.  Fixed unit tests so that they all pass
3.  Minor renaming to correct copy/paste errors