reconfigured files to reflect unified unit testing