Refactored unit tests
refactored abstract test class
refactored test