test and fix pushonly options