Generalised and cleaned up the spec so it can be used against two different tests easier, as it'll be used against the block changes in the slim branch.