Remove unnecessary specs
Remove unused helper
Add tests and validations