Adding user validations and fixing fixtures