Take out reference to matt's test setup