Maven stuff and fixed test directory association
Optimized imports
Switched to the correct JUnit assertion import