Fixed three mainline doctests.

The recent format improvements mean that ...

    print '... {} ...'.format(measure)

... is now different than ...

    print '... {} ...'.format(str(measure))

... for some reason.

Only an issue in two doctests.

All tests everywhere in the system (both mainline and experimental)
now run without failures.

FIXME items in experimental remain but are temporarily skipped.