unit test improvemens