More updates to Junit