MB-22
user unit test , bug fixing