Reclassify some performance tests

Authored by goldfire on Jul 14 2018, 2:43 PM.