fix the junit test cases to run properly
Merge branch 'master' of https://github.com/digitalabs/Fieldbook