Feature/unit tests