Merge "Update unit tests"