Test suite syntax cleanup