E2e refactor

TODO: Check that Å comes before Ä