Removed old code from MultipleChoice

Removed an unnecessary error check from MultipleChoice, from earlier
testing.
Added Test functionality

Added all Survey functionality to the Test class. Reformatted a few
files.