Merge "Update unit tests pt2"