Validator tests added, Controller tests updated