Made unit tests executable from IntelliJ + simplified test code