Simpler more unified test