Modified Trace add-record methods, fixed queue test.