refactoring.
added common base test class.
test fix.