Moved plot methods as class methods.
Fixed tests so that everything now passes.