Initial tests cleanup