[CLEANUP] Kitchen and Test Cases