new kirby version and more tests