Improved tests for CONSTRUCT