Small fixes: test, last element of list