Fixing TestList (not finished)