reverted some code back to previous due to junit errors in Jenkins