added List to models, updated views and tests