Added FuncTester and supporting tests
Merge branch 'output' into dev

Added FuncTester and supporting types and tests