Updates to latest version of list, updates test cases to match