Merge in changes to setup test environment.