Also want to point out that I split test changes across both commits earlier, marking device context bit as todo, so that each pass tests. A bit hidden if not looking at individual commits in diffs.
Yes, that's the correct way - tests should pass on each commit.