Updating unit tests to reflect current change