Update junit tests and their related parts