Clean up Xw package from outdated and unused functionality Adjusting test case for current state of master