Put related tests back to ERROR