Merge branch 'jacobmarble-master'
Updated tests to work with new method names, and backend formats