Merged in default (pull request #55)

Fix building of test programs

Approved-by: Gary Kramlich