Add kss/shotgun. Make unit tests feel nicer