Re: 2 bugs in test setup