Added some changes to test