Moved gl_state test out of the class into a separate file
More work on gl_state