Feature/helper tests