Refactoring and bugfix (attributes of a list element)
Complete refactoring in the tests