Re-enable tests in sbinary (pull request coming up)