removed unused import
updated junit framework version to 4.11 and added conditional ignore annotation
added conditional ignore to prob tests such that they will be ignored if prob isnt present
Merge branch 'origin/test'