Code coverage up to 90%