Applied patch for http://dev.kohanaframework.org/issues/4737
Fix up some minor test issues.