Update TRE tests. Also minor refactoring to use of an internal method instead of explicit init.