diff --git a/test/Audio_test.cpp b/test/Audio_test.cpp
index 8512928..854fe42 100644
--- a/test/Audio_test.cpp
+++ b/test/Audio_test.cpp
@@ -5,7 +5,7 @@
 //  James Turk (jpt2433@rit.edu)
 //
 // Version:
-//  $Id: Audio_test.cpp,v 1.10 2005/08/08 06:37:10 cozman Exp $
+//  $Id: Audio_test.cpp,v 1.11 2005/08/08 19:24:30 cozman Exp $
 
 #include "photon.hpp"
 using namespace photon;
@@ -66,7 +66,7 @@ public:
     
     // executes the checking of the keys, when a key is pressed 
     //  the state is toggled
-    void onKeyPress(int key)
+    void onKeyPress(KeyCode key)
     {
         static const std::string NOT_PLAYING = "NOT ";
         
diff --git a/test/Input_test.cpp b/test/Input_test.cpp
index fbc3d2f..8649837 100644
--- a/test/Input_test.cpp
+++ b/test/Input_test.cpp
@@ -5,7 +5,7 @@
 //  James Turk (jpt2433@rit.edu)
 //
 // Version:
-//  $Id: Input_test.cpp,v 1.7 2005/08/08 06:37:10 cozman Exp $
+//  $Id: Input_test.cpp,v 1.8 2005/08/08 19:24:31 cozman Exp $
 
 #include "photon.hpp"
 using namespace photon;
@@ -26,25 +26,25 @@ public:
     }
     
     // listen for events and set the last event string
-    void onKeyPress(int key) 
+    void onKeyPress(KeyCode key) 
     {
         lastEvent = "key " + boost::lexical_cast<std::string>(key) + 
             " pressed";
     }
     
-    void onKeyRelease(int key)
+    void onKeyRelease(KeyCode key)
     {
         lastEvent = "key " + boost::lexical_cast<std::string>(key) + 
             " released";
     }
     
-    void onMouseButtonPress(int button)  
+    void onMouseButtonPress(MouseButton button)  
     {
         lastEvent = "mouse button " + boost::lexical_cast<std::string>(button) +
             " pressed";
     }
     
-    void onMouseButtonRelease(int button)
+    void onMouseButtonRelease(MouseButton button)
     {
         lastEvent = "mouse button " + boost::lexical_cast<std::string>(button) +
             " released";