Quite similar, but I ask for "/grilling" skill in every prompt so the agent aligns to my decissions before it drifts into own.
And I actually ask to make tests before any implementation and let them all fail.
TDD advocates would be proud of you ;) differently from your approach I still prefer to make sure the model code is inline with my expectations and only then ask for unit tests, only exception is when I am dealing with a bug then the failing unit test is a MUST.