Improve tests and data

- Switch to Fog
- Update the tests to reflect new functionality and also to avoid creating untestable situations (e.g. don't use group IDs for source groups)