Added in basic tests