Remove supported exception

(and refactor tests to be more linear)