Froze data in tests to ensure functional idempotence.
Merge branch 'master' into load