Final weighting excluding spatial

Add "final weighting excluding spatial", amend how changes to weightings are saved (namely by removing pendingSave set) and improve tests all round.