Added more Unit Tests (including SaveMatch)