adding test kitchen and fixing OPS-648