83 - Added complete JUnit testing(for now)