Update upto testing API
Merge branch 'testing' of github.com:66Ton99/Heartland into testing