Not a ksp plugin

Misc fixes
The tests are native.