refactor(expand): all tests are fixed