re-enable test cleanup, add easy test config saving line