Made some changes in tests and made small fixes in game