Changes in tests and added one more test