ouya-izing the tests and fixes to match up with the refactoring of method and attribute names.