Also, move relevant tests to a better place. Merge to v5.3
to avoid having a separate, new manual for the one library