port multi instance tests
ported image cleanup tests