Some additions for testing including fixed image resolution