Pulled Editor into its own class.
Fixed tests