Unit Test fixes and cleanup.