Feature/more unit tests