basic: update descriptions and add some more tests

Change-Id: Ice829c70482171bbfc22719e4b9e30c5ac058f5e