WIP: Refactor decision for whether builtin uniform tests need VBOs