Fix up component tests, add catchstatistics