Synchronize sboi tests with what we have in doms