fixed weighting, improved testing