Fixes and jUnits