Some Fixes
Junit