add new tests and changes in tests