Feature/add tests