Update unit tests to reflect latest changes