Added Match statistics
Added unit tests