Fix tests so they are autonomous.