Bugfix in moderation and further tests