Feature/mg/testing