Back to basics

TDD style