Test refactor

Refactored tests - now they don't create and delete files, or generate xmls, or derive from some logical classes.