Improved SourceTests, again