Using IntelliJ now. Added tests