Feature/unit testing