Added Tests and changed method signatures in Match Entity