Restored tests overwritten by the statement_extension commit