Evaluations refactoring and non-thresholded bugfix, plus test to ensu…#30

thcrock wants to merge 1 commit intomasterdssg/catwalk:masterfrom

bugfixesdssg/catwalk:bugfixesCopy head branch name to clipboard