fix tests for previous changes