Feature/mammothbane/unit tests