Updated with simpler test.