I totally refactored the factories and yet not thoroughly enough for my standards. They still feel like a short-circuiting hack (like a mock v actual exercise of api), but they're closer to real. Further refactoring would be useful but they are an improvement over the existing imho