Fixed some test setups