Remove sleazy use of test infrastructure for fixture creation