Fix bug introduced in the previous commit where "is a NP (NP CC NP)" was broken. Add maven build strategies. Uncomment tests that are known to fail