New simpler test a la dave