Full refactoring of tests

Cannot run TestNG tests on IntelliJ IDEA after update, moved to JUnit4