Added Test, streamlined Survey creation process, input validation