Add guard and spring for auto testing
Remove I18n due to interfering with poly comments
Comment polymorphism WIP