Fixes issue with tests