Trying to tie out all tests for TRN-487a