Merge branch 'test-code'

Signed-off-by: Henry Fan <Henry.Fan@T-Mobile.com>

Conflicts:
	test.txt