Re-organised imports
Updated validation test. SSoD/DSoD conflicts should raise a warning, not
an error