Fixing testmod build breaks due to updates
Merge origin/master -> master-refactor