Code Merge

[Eldon Carman]

Hi Guys,

After completing a code review with Till, I merged my recent changes into
master. The updates focus on preparing the benchmark and improving our
testing with XQTS. Should we we consider doing a new release with these
changes?

Preston