clean up kiwi spec a bit