Fixing method list, adding test on it