Adding more tests

Signed-off-by: Peter van der Does <github@avirtualhome.com>