Changes function name, fixes test_list compilation and other code cosmetics.