More flexible modules from list  definition parsing + tests