Refactoring and removed test data