Fix for storeable tests.