I like to rewrite history so every feature has a test commit followed by a implementation commit. Then I can easily run the test to see it fail, move the head up a commit, and run it again to see it pass.