Improve unit test
minor improvements