Looking into test issues
Fixed up accidental wrapper