Added additional scaffolding for the Unit Tests.