Feature/add more tests