Speed up test intervals

Reduce the time between the sets of tests
Fix wrong way ID
Add tests for relations

Does not yet include diff processing