Add some test and function