Unit test lib improved.