Improved scoring, altered result format, fixed tests