Adding some more tests & coverage make task.