Fixed setUp procedure