adds acceptance testing & error messages

adds acceptance, error messages