Use simpler test logic