Removing TODO in testing cases due to improvements