Re-enable test 1; fix it