Modified tests to conform to new lists