Add test for config drive, cleanups