Added better separation between different tests setups