Moar syntax test cleanup