Hi, currently, the CMS code contains some code duplication concerning submissions and user tests. See for example cms/db/submission.py, cms/db/usertest.py and EvaluationService. Furthermore, some features are only supported for submissions. E.g., the AWS doesn't show user tests, neither can they be regraded easily. It also seems a bit uncanonical to me that there is a separate "Submissions" menu item for each task in CWS but not a separate "Testing" item for each task, though that is certainly something one can argue about. What do you think about merging submissions and user test code where possible and extending features to user tests also? Is there maybe already any progress towards this? Concerning AWS, it would be wise to wait for Luca's rewritten AWS, I guess. Best, Fabian