fixes #5, #6 and testcase + added kitchen suit