Minor changes based on Robert's comments on PR #624.
Used frame0.dtr as reference for unit testing.