Removed point from TODO as it is now covered by the TransactionHelper.