Unfudge now passing tests after merge of var-traits branch