Move to new style python classes.
Update the test for cfarm to actually pass.