Changes to Starter and TestRepo