Fixing some test setups
Fixing several tests