Added base test class to improve existing and new unit tests