Merged changes from unit_testing into he project
	source: ready for field testing;

Signed-off-by: Jonathan <jonathancw@me.com>