Resolving works, has a test
Restore BertSimOracle to working order