merge with inet 2.1
restructure underTest directory
restructure underTest directory
fix return value