Revert scalar construction test