cleanup of list* functions
rebase test file