refactoring xml and added tests for other money
renaming