added return value check to tests
Added removePoorMatches method

+ Fixed indentation
+ Removed redundant includes