Merge "mark tests as SmallTest"