Added some testing codes