Change List to Array to avoid conflict with java.util.List. Remove elements from test for #490