Emma : imrpove coverage and remove use of deprecated API