Add support for arrays. Add cleanup after test that was leaving stuff behind