Add comments, numerical location test, and improvements to occupancy test