Feature/add testing