CLEARWATER: Move the existing unit tests into the OUnit suite.