Tests actually do something now

- Not quite perfect, but good enough for now
- Also fixed (what I think is) a bug in old_api