misc. updates to testing.