add AttributeLists and tests, plus some cleaning