When firing a location object set an anonymous object with a location object.
Update tests to use location instead of loc. Also, handle new case where location allows a null value.