The KF issue introduced in #223 was fixed without adding tests as part of a hot fix Add tests to make sure the issue doesn't crop up again
