Merged in GBQ Module and Corresponding Test Suite