second attempt at fixing test build to handle system properties