Improves the tests and also the model to consistently throw
IllegalArgumentException rather than a mixture of
IllegalArgumentException and ArrayIndexOutOfBoundsException depending on
which exact store is used..