Add composite expression tests