Fixes and Junit