Add List test and improve view