Add more language constructs to test