TRUNK-257 - fix junit tests