Fix failing tests

More janitorial duty
Add docblocks