Changes for the new way of testing items AND new Config