applied patch
fix existing list classes
fix tests