add more tests, tweak handling of ineligible points