Update unit tests

Update unit tests for the previous commit.

Signed-off-by: Dries Vints <dries.vints@gmail.com>