Updated unit tests

Updated the unit tests for the latest commit.