Fix failing tests. Wrong order.
Enhance docs and clean up.
Documentation updates.