Trying to fix issues with tests