Add tests for all of the remaining constructs