Added some tests, changed doesMatch() to score()