refactored and modified tests