diff --git a/C++ProjectTemplate b/C++ProjectTemplate
index 898412e..7ebb366 100755
Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ
diff --git a/main.cpp b/main.cpp
index 06de539..150b581 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5609,6 +5609,9 @@ char SeasonI::GetTileDegreeSafely(std::vector<std::vector<TILE*>>&data){
 void SeasonI::PressTestKey(Key k) {
 	TESTKEYS[k].bPressed=TESTKEYS[k].bHeld=true;
 	TESTKEYS[k].bReleased=false;
+	KEY_LASTPRESSED=k;
+	lastPress=frameCount;
+	lastRepeatedFrame=frameCount;
 }
 
 void SeasonI::ReleaseTestKey(Key k) {
diff --git a/states.h b/states.h
index 792e1a6..7cca49b 100644
--- a/states.h
+++ b/states.h
@@ -25,6 +25,7 @@ namespace GameState{
         MAP_POSITION_SELECT,
         FILE_LOAD_SELECT,
         DISPLAY_CUTSCENE_TEXT,
+        TEST_GAME,
     };
 }
 
diff --git a/test/test.cpp b/test/test.cpp
index e8cef7d..64aa43c 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -195,6 +195,9 @@ void TestSpriteInitialized(std::vector<std::string> sprList) {
 }
 
 bool SeasonI::OnUserCreate(){
+	GAME_STATE=GameState::TEST_GAME;
+	Test("We start in the TEST_GAME state",
+		GAME_STATE==GameState::TEST_GAME);
 	for (int i=0;i<PARTY_MEMBER_STATS.size();i++) {
 		Test("Party Member stats should not be initialized",
 			PARTY_MEMBER_STATS[i]==nullptr);
@@ -563,6 +566,37 @@ bool SeasonI::OnUserCreate(){
 		Test(k.keyName+" key is no longer released",
 			!GetKeyReleased(*this,k));
 	}
+	Test("We are still in the TEST_GAME state",
+		GAME_STATE==GameState::TEST_GAME);
+	TestKey testRepeatKeys[] = {key::UP,key::DOWN,key::LEFT,key::RIGHT};
+	for (TestKey k : testRepeatKeys) {
+		frameCount=0;
+		PressTestKey(k.k);
+		for (int i=0;i<23;i++) {
+			updateGame();
+			Test(k.keyName+" key is not considered pressed",
+				!GetKeyPressed(*this,k));
+			keyUpdates();
+		}
+		int attemptCount=1;
+		updateGame();
+		Test(k.keyName+" key is considered pressed again (Attempt "+std::to_string(attemptCount++)+")",
+			GetKeyPressed(*this,k));
+		keyUpdates();
+		for (int j=0;j<2;j++) {
+			for (int i=0;i<3;i++) {
+				updateGame();
+				Test(k.keyName+" key is not considered pressed",
+					!GetKeyPressed(*this,k));
+				keyUpdates();
+			}
+			updateGame();
+			Test(k.keyName+" key is considered pressed again (Attempt "+std::to_string(attemptCount++)+")",
+				GetKeyPressed(*this,k));
+			keyUpdates();
+		}
+		ResetTestKeys();
+	}
 	return true;
 }