Fix remaining wrappers
All tests working