Made some changes to tests