Added some midway tests.
Stopped work in this branch until some e2e testing is setup