bug fixing and more tests for score