Fix up a call to stop with an old instance dict

Temporarily just re-fetch as an object.

Change-Id: Ideaf0cbbe2628bac19a1db731054a49efc64132f
Fix compute tests for cells

Turns some tests into unit tests.