Added more tests in Playertest and CalculationsTest