Merge "Updating unit tests so they match the expected output"