Added couple of new test