Add some more unit tests for the Trace model
Fix interpolation variable errors