A better local test configuation, along with some updates