Fix issue with tests