More unit tests, even if they hurt...

No pain, no gain!