Incremental progress everywhere
Write test case for image_manager