Remove breaking code from deprecated helpers
Fix tests
1.1.7-8