Work for gui lists with tests + small fixes