Weightings

Add "final weighting excluding spatial", and improve tests all round.