[#12] Continued work with unit tests