Update server diff algorithm to use ms from server, update tests