restoring some tests