diff --git a/src/scene/cameranode.cpp b/src/scene/cameranode.cpp
index 515714b..2a5853c 100644
--- a/src/scene/cameranode.cpp
+++ b/src/scene/cameranode.cpp
@@ -13,8 +13,8 @@ void CameraNode::update()
     {
         if(action == m_action_move)
             moveCamera(diff.x, diff.y);
-        else if(action == m_action_move)
+        else if(action == m_action_rotate)
             rotateCamera(diff.x, diff.y);
     }
-    zoom(m_input->getDeltaVerticalScroll());
+    zoom(m_input->getDeltaVerticalScroll()*120.f);
 }
diff --git a/src/test/main.cpp b/src/test/main.cpp
index 8e9e0ec..ea7cbad 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -46,6 +46,11 @@ public:
         b.key = sf::Keyboard::KeyCount + sf::Mouse::Right;
         keys.push_back(b);
     }
+
+    static std::vector<int> getMap()
+    {
+        return {ROTATE_CAMERA, MOVE_CAMERA, TOGGLE_CONSOLE};
+    }
 };
 
 class TestGen : public TerrainGenerator
@@ -109,7 +114,7 @@ void generateTerrain(SceneTree *scene)
             chunk->mesh->setMaterial(mat);
             chunk->mesh->initGL();
             MeshNode *node = new MeshNode(chunk->mesh);
-            node->setTransform(glm::translate(glm::mat4(), pos));
+            node->setTransform(glm::translate(glm::mat4(), pos*8.f));
             scene->addObject(terrainContainer, node);
         }
     }
@@ -206,12 +211,9 @@ int main(){
 
 
     Input* input = engine.getInput();
-    std::vector<int> v = {myKeysMap::TOGGLE_CONSOLE};
-    input->addContext(Context("default",v));
 
-    IKeysMap km = myKeysMap();
-
-    input->setKeysMap(km);
+    input->setKeysMap(myKeysMap());
+    input->addContext(Context("default", myKeysMap::getMap()));
     input->setCurrentContext("default");
     input->updateKeyBindings();
     engine.start();