Adapt error tests and add back in