Reorganise testing, make importable.
Add some notes on current significant merge behaviours.