Fixed grid point bug
And added test to ensure the grid point selected is within the facility (should always be true for the test case)
And added test to ensure the grid point selected is within the facility (should always be true for the test case)