Merge "Update SmallTest library"