Fix test suite
Support for no discretionary data