Updating PuzzleActivity (in progress)

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