XDD Minor bohr testing updates

Minor test improvements.