183166a Fix broken unit tests from PR#63 and PR#64 merge

Authored and Committed by mprahl 7 years ago
    Fix broken unit tests from PR#63 and PR#64 merge