remove only from test and fix bug that was hidden