Feature/updated tests