Working branch completing unit tests pending Coverall setup.

Working branch completing unit tests pending Coverall setup.