Nearest pickup point added and better test file