Refactored the base unit tests a little and added some more capturing methods. Fixed a few other minor issues.