Add moderation bool key, and fixed unit tests