Update on test to add code coverage tool and update some test