Turned Dict from object into instance tied to TR.

Added tests.
Merge branch 'master' into slurm-eval