Stop! Hammertime...

I mean, test first now.