flower and merchant controllers now tested