FIX Renamed test method to not conflict as a constructor name
Merge branch 'master' into 3.0