checkpoint Issue #174: working on getting test case to run

also working on toolbox baseline support