Wrapping up of test cases
Signed-off-by: H.K. Wong <hkwong74531@yahoo.com.hk>