* Use new enums in vizio tests * Code review: revert wrong conftest changes * Code review: Revert incorrect removal of vizio const * Reinstate wrongly reverted files * Fix double line * Fix new test after rebase