Add test module, add more semantic for input handling