refactored gl-2d test