Fixed junit tests