Still broken implementation of SDC, but better unit-tests