Added kitchen tests and fixed some renaming issue