Improve test unit coverage