NOREF: Getting the test branch setup with the changes from Waltham