Ensuring compatibility with v0.2 unit tests

Modified class method names back to the original ones used by Olivier
(this was a source of many of the unit tests failing). At this point,
all but one of the unit tests is now working as before. Further updates
to come before the next pull-request.