Code Cleanup

Sonar suggested cleanup
Proper handling of exceptions
A few ignores for tests that started failing and unable to determine
route cause currently
Code Cleanup 2

Updated some dependencies.
Removed test ignores by adding try around block that is having issue.
Still unsure why but at least tests will run now.
Merge pull request #105 from hazendaz/master

Code Cleanup