Added some test functions