Merge "Update junit test"