Update existing unit tests

Signed-off-by: Dries Vints <dries.vints@gmail.com>
Add new unit tests

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