updated unit tests to correspond to the latest changes in the code.