Moved routes to handlers module, wrote some tests for handlers