Address some issues with the testsuite rules (#672)

Authored by alpmestan on Sep 3 2018, 12:26 PM.