Test imporvements