Removed Location Mandatory check and test code