Added some functions to test