cleaning up junit tests