Move integration tests into their separate folder
Add StepMixin
Add step mixins to XBlocks that can be steps