CRAY - Fix minor memory leak and clean up code
CRAY - Disable test since it will not run correctly