ALM-682 tweak permissions and tests