Added filling location fields to the tests.