improve unit tests, nits