Added couple of tests