Adding more validation/test around answers