Add list handler, and fix small bug with testdata