Modified test class for testing
merged with local