Made changes to unit-test structure in program