Fixes in basic test