Annotation-based shuffle of factory tests.
Merge branch 'gh-159'