Working on unit tests [#6]