Syntax class fix and disable two tests