Configuration changes

A few updates to get tests building on other machines