Run can take individual scenarios

- This enables the self-test to just run itself
- This should probably be tackled with namespaces really...