modified to enable building of tests