Refactored kappa unit tests a bit to help pinpoint problem.