updated junit tests to conform to new testing standard