refactor to resolve #38
fix test to reflect refactor (props.setQueryExpression -> queryBuilder)
Merge pull request #49 from Trott/refactor-enum-passing

refactor to resolve #38