Modified by Philip Withnall to omit the subdirectory and drop the `refcount` suite as both seem like unnecessary over-categorisation. Related to issue #1434