Refactored testing
Fixed translation and added testing for translation
Merge branch 'feature/issue-9-translation-testing' into develop