Refactored Tests. Added efficiency test builder. Fixed some incorrect questions