Switching to TDD for good...

#1