Interim commit, writing unit tests