Forgot to re-enable some tests