Simplify even more, and re-enable test.