fix problems with tests