Add OHQ controller and Add OHQ tests