Merge pull request #84 from phillmv/fix_static_mode

Fix static mode tests

WIP: if not set otherwise, identifiers are now generated from the sub…

…ject

accidentally pushed code fragment which broke main branch but worked …

…locally due to uncommitted changes, now fixed.