More changes are coming to the test branch