format code and make unit test more short
format code and make unit test more short
format code and make unit test more short