Translated everything to english and added JUnit 4 for tests