Fixing some issues with the tests