Added New Tests, Changed Main Game File