Full spec rework, now using single assertions.