Get kitchen tests passing again