A few test build changes.