Fixes for various tests
Make system custom information data-driven. Also fixed updating custom system information.
Merge pull request #610 from omaciel/custom

Make system custom information data-driven. Also fixed updating custom s...