Restoring some tests