Use less stupid code to perform suites overrides. Thanks @Blasz

Refs #269.