fix two issues report by @fdb713
add more test cases for score calculator
change class name, make more sense