Modify junit tests