Created xml test
Refactored to modules
Refactored to modules