Fix problem with tests