Added keysw and piezo test
Updated TODO