Fix issues in basic tests