Fixes and junit