Iteration1

Added validations and fixed controller tests