Add some more tests - never in vain