Tweaking to explicitly include junit4