Added some test control. -- Jashon Wan