This commit passes specs that once worked, but broke during the change of information storage, these specs are now passing again.