Merge "Update junit Assert imports"