shepherd: passed test 008 and 015

The root of the problem was a silly usage of list_add().