Uncomment and fixup TestValidMethods