unit tests enhancement