Added html coverage option
Rename some properties