Remove tests II