Added some test funcs and changed  menu