Simplify setup code for dav tests