Get tests to green, somehow