Fix integration test cleanup and add script to build test images