updated API in tests: warning many tests are failing now
Merge remote-tracking branch 'origin/master'