Add feature for the "--unsupported" flag

Also make step definitions a little more generic.