Merge pull request #18 from jennwu/master

Fixed changes from code review
Updating PuzzleActivity (in progress)

Made several small changes to DiversityTest to make extra checks while
querying.