10: Cleanup FXML imports 
Moved class from test directory into main
10: Cleanup FXML imports 
Fixed test