refactor tests for more points