Unit test improvment