improving test setup