some unit test improvements

some unit test improvements