Repackaged and working through scoring unit test, fixing issues as found