More test imporvements