Merge "Restore the unit tests removed"