Update tests. Fix critic warnings.