Updating setup to produce a better test environment