Improve ctest imaging