Add coverage analysis
Remove unused function
Add some more tests and coverage testing