Change unittest package name and improves code coverage