More tests, also static EntryStorage is bad