keycodes: fix keycode serialization for layered keycodes

src/main/python/keycodes.py

@@ -89,7 +89,7 @@ class Keycode:
             outer = cls.find_outer_keycode(code)
             inner = cls.find(code & 0xFF)
             if outer is not None and inner is not None:
-                return outer.qmk_id.replace("(kc)", "({})".format(inner.qmk_id))
+                return outer.qmk_id.replace("kc", inner.qmk_id)
         return code
 
     @classmethod

src/main/python/test/test_keycode.py

@@ -1,11 +1,20 @@
 import unittest
 
-from keycodes import Keycode
+from keycodes import Keycode, recreate_keyboard_keycodes
+
+
+class FakeKeyboard:
+
+    layers = 4
+    macro_count = 16
+
 
 
 class TestKeycode(unittest.TestCase):
 
     def test_serialize(self):
+        recreate_keyboard_keycodes(FakeKeyboard())
+
         # at a minimum, we should be able to deserialize/serialize everything
         for x in range(2 ** 16):
             s = Keycode.serialize(x)