Added couple more tests