Tests Updated

Updated tests to account for core/trace change.