fix tests to reflect changes to models
fix bugs and i18n #404
fix merge conflicts