Cleaned up test cases, most importantly by removing hard-coded IDs

- Some tests had been kind-of-fixed by hard-coding ID results (fixed)
- Quite a few extra, old steps in some tests (removed)