#JC-552: Corrected junit tests