begin refactoring score data collection, add tests