updated some namespaces
updated XML loader to have tests, also changed var  to