Added tests for the single match entity and removed some unneeded method
Added tests for the double match and the abstract match entity