Fixed bug in test + Coverage improved