Removed JavaFX dependency to work with Java 8; updated JUnit
Restructured test and updated things to work with Java 8