Tests no longer rely on plus classes