small test setup tweaks