Redesign static lists
Some UTs