More work on refactoring the product variant creation.  Updates tests to simulate new methodology.