Back to OpenGL, and remove tests