Changed location testing to create a separate instance for each test