Issue #1. Sprint 7 - Cleanup and unit testing fixes.