minor changes to weights, and full tests