Add VAO support and add to test