fixed problems with tests