re-organize tests and remove .kitchen