Some improvements unit test