pass impl tests and properly grouby things with kind