Added tests
Updated Changes