Added some changes @Tests