Improve coverage, use chai assertions

Change-Id: I2bf69b224dbd245e731c00389fb17a08eddfe7ae