Improved GrassTest cases