Patch tests to work under ARC
More refactoring
Fix banners
More refactoring