green: Get tests passing again