More steps towards unit testing my way.