improve unit tests
improve unit tests