Random style fixes

Fixed: Some minor issues; resolving them doesn't change anything, it's just a question of code style.
The LocationGeneratorTest will now always work

Fixed: The location generator test now resets the current registry & resource store in order to provide a consistent testing environment. That is needed for getting the test run everywhere.